Refactor MCP shims to avoid litellm import cycles#323
Closed
chrisnestrud wants to merge 2 commits intocecli-dev:mainfrom
Closed
Refactor MCP shims to avoid litellm import cycles#323chrisnestrud wants to merge 2 commits intocecli-dev:mainfrom
chrisnestrud wants to merge 2 commits intocecli-dev:mainfrom
Conversation
Lazy-load litellm.experimental_mcp_client and move LocalServer helpers under aider.mcp_support so coders no longer import the heavy MCP stack at module import time. Without this change the branch repeatedly crashed pytest with circular ImportError whenever litellm shipped without the experimental MCP extras, blocking any tests that touch aider.coders.
Running the documented pre-commit hooks failed with E402/isort warnings because the lazy MCP proxy lived above the project imports. Move the proxy definitions below the import blocks in agent_coder and base_coder so auto-formatting passes.
Collaborator
|
Why change the folder name to I'll hold 0.91.2 since we seem to be on at the same time for this |
Author
|
I ran into an MCP-related module conflict when creating tests for
#324
If there is a better solution, I'm all for it.
|
Collaborator
|
What modules were conflicting? |
Author
|
I'm not able to reproduce this now. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Lazy-load litellm.experimental_mcp_client and move LocalServer helpers under aider.mcp_support so coders no longer import the heavy MCP stack at module import time. Without this change the branch repeatedly crashed pytest with circular ImportError whenever litellm shipped without the experimental MCP extras, blocking any tests that touch aider.coders.